Skip to content

Update stage0 bootstrap compiler #41544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 29, 2017
Merged

Update stage0 bootstrap compiler #41544

merged 1 commit into from
Apr 29, 2017

Conversation

alexcrichton
Copy link
Member

We've got a freshly minted beta compiler, let's update to use that on nightly!
This has a few other changes associated with it as well

  • A bump to the rustc version number (to 1.19.0)
  • Movement of the cargo and rls submodules to their "proper" location in
    src/tools/{cargo,rls}. Now that Cargo workspaces support the exclude
    option this can work.
  • Updates of the cargo and rls submodules to their master branches.
  • Tweak to the src/stage0.txt format to be more amenable for Cargo version
    numbers. On the beta channel Cargo will bootstrap from a different version
    than rustc (e.g. the version numbers are different), so we need different
    configuration for this.
  • Addition of dev as a readable key in the src/stage0.txt format. If present
    then stage0 compilers are downloaded from dev-static.rust-lang.org instead
    of static.rust-lang.org. This is added to accomodate our updated release
    process with Travis and AppVeyor.

@rust-highfive
Copy link
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@brson
Copy link
Contributor

brson commented Apr 25, 2017

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 25, 2017

📌 Commit a71c83b has been approved by brson

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Apr 25, 2017

📌 Commit 24e5fa1 has been approved by brson

@Mark-Simulacrum
Copy link
Member

This should not be approved. Many tidy errors.

https://travis-ci.org/rust-lang/rust/jobs/225805041#L793

@frewsxcv
Copy link
Member

@bors r-

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Apr 26, 2017

📌 Commit 345f539 has been approved by brson

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 26, 2017
@frewsxcv
Rollup merge of rust-lang#41544 - alexcrichton:bump-bootstrap, r=brson
382a869 
Update stage0 boostrap compiler

We've got a freshly minted beta compiler, let's update to use that on nightly!
This has a few other changes associated with it as well

* A bump to the rustc version number (to 1.19.0)
* Movement of the `cargo` and `rls` submodules to their "proper" location in
  `src/tools/{cargo,rls}`. Now that Cargo workspaces support the `exclude`
  option this can work.
* Updates of the `cargo` and `rls` submodules to their master branches.
* Tweak to the `src/stage0.txt` format to be more amenable for Cargo version
  numbers. On the beta channel Cargo will bootstrap from a different version
  than rustc (e.g. the version numbers are different), so we need different
  configuration for this.
* Addition of `dev` as a readable key in the `src/stage0.txt` format. If present
  then stage0 compilers are downloaded from `dev-static.rust-lang.org` instead
  of `static.rust-lang.org`. This is added to accomodate our updated release
  process with Travis and AppVeyor.
@frewsxcv frewsxcv mentioned this pull request Apr 26, 2017
Closed
@aidanhs aidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 26, 2017
@bors
Copy link
Collaborator

bors commented Apr 26, 2017

☔ The latest upstream changes (presumably #41352) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Apr 26, 2017

📌 Commit e4cd4d1 has been approved by brson

arielb1 pushed a commit to arielb1/rust that referenced this pull request Apr 26, 2017
Rollup merge of rust-lang#41544 - alexcrichton:bump-bootstrap, r=brson
14d4aa9 
Update stage0 boostrap compiler

We've got a freshly minted beta compiler, let's update to use that on nightly!
This has a few other changes associated with it as well

* A bump to the rustc version number (to 1.19.0)
* Movement of the `cargo` and `rls` submodules to their "proper" location in
  `src/tools/{cargo,rls}`. Now that Cargo workspaces support the `exclude`
  option this can work.
* Updates of the `cargo` and `rls` submodules to their master branches.
* Tweak to the `src/stage0.txt` format to be more amenable for Cargo version
  numbers. On the beta channel Cargo will bootstrap from a different version
  than rustc (e.g. the version numbers are different), so we need different
  configuration for this.
* Addition of `dev` as a readable key in the `src/stage0.txt` format. If present
  then stage0 compilers are downloaded from `dev-static.rust-lang.org` instead
  of `static.rust-lang.org`. This is added to accomodate our updated release
  process with Travis and AppVeyor.
@arielb1 arielb1 mentioned this pull request Apr 26, 2017
Closed
@arielb1
Copy link
Contributor

arielb1 commented Apr 26, 2017 

[00:00:58] Usage:

[00:00:58]     cargo metadata [options]

[00:00:58] thread 'main' panicked at 'command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "metadata" "--format-version" "1" "--format-version=1" "--manifest-path" "/checkout/src/libstd/Cargo.toml"

@bors r-

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Apr 26, 2017

📌 Commit 850e511 has been approved by brson

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Apr 26, 2017

📌 Commit 6117616 has been approved by brson

@bors
Copy link
Collaborator

bors commented Apr 27, 2017

⌛ Testing commit 6117616 with merge 09f6822...

@Mark-Simulacrum
Copy link
Member

Looks potentially non-spurious. I think a Cargo.toml file is missing.

https://ci.appveyor.com/project/rust-lang/rust/build/1.0.3102/job/r6738jb52c5j7or7#L7599:

thread 'main' panicked at 'File::open(toml_file_name) failed with The system cannot find the path specified. (os error 3)', src\bootstrap\lib.rs:1070

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 29, 2017
@bors
Copy link
Collaborator

bors commented Apr 29, 2017

☔ The latest upstream changes (presumably #41577) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Apr 29, 2017

📌 Commit c1107f8 has been approved by brson

@bors
Copy link
Collaborator

bors commented Apr 29, 2017

⌛ Testing commit c1107f8 with merge ee63639...

@bors
Copy link
Collaborator

bors commented Apr 29, 2017

💔 Test failed - status-travis

@Mark-Simulacrum
Copy link
Member

Failure looks non-spurious.

[00:52:52]     Finished release [optimized] target(s) in 360.71 secs
[00:52:52] Dist cargo stage2 (x86_64-unknown-linux-gnu)
[00:52:52] thread 'main' panicked at 'etc.join("man").read_dir() failed with No such file or directory (os error 2)', /checkout/src/bootstrap/dist.rs:594

@shepmaster
Copy link
Member

boostrap compiler
BOO 👻

I'm just saying if you have to rebase the commit anyway, you might as well fix the typos ;-)

@alexcrichton alexcrichton force-pushed the bump-bootstrap branch 2 times, most recently from cbfdbdb to 541f8ec Compare April 29, 2017 17:31
@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Apr 29, 2017

📌 Commit 541f8ec has been approved by brson

@Mark-Simulacrum Mark-Simulacrum changed the title Update stage0 boostrap compiler Update stage0 bootstrap compiler Apr 29, 2017
@bors
Copy link
Collaborator

bors commented Apr 29, 2017

⌛ Testing commit 541f8ec with merge 9321325...

@bors
Copy link
Collaborator

bors commented Apr 29, 2017

💔 Test failed - status-appveyor

@alexcrichton
Update stage0 bootstrap compiler
5daf557 
We've got a freshly minted beta compiler, let's update to use that on nightly!
This has a few other changes associated with it as well

* A bump to the rustc version number (to 1.19.0)
* Movement of the `cargo` and `rls` submodules to their "proper" location in
  `src/tools/{cargo,rls}`. Now that Cargo workspaces support the `exclude`
  option this can work.
* Updates of the `cargo` and `rls` submodules to their master branches.
* Tweak to the `src/stage0.txt` format to be more amenable for Cargo version
  numbers. On the beta channel Cargo will bootstrap from a different version
  than rustc (e.g. the version numbers are different), so we need different
  configuration for this.
* Addition of `dev` as a readable key in the `src/stage0.txt` format. If present
  then stage0 compilers are downloaded from `dev-static.rust-lang.org` instead
  of `static.rust-lang.org`. This is added to accomodate our updated release
  process with Travis and AppVeyor.
@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Apr 29, 2017

📌 Commit 5daf557 has been approved by brson

@est31 est31 mentioned this pull request Apr 29, 2017
Closed
@bors
Copy link
Collaborator

bors commented Apr 29, 2017

⌛ Testing commit 5daf557 with merge afa1240...

bors added a commit that referenced this pull request Apr 29, 2017
@bors
Auto merge of #41544 - alexcrichton:bump-bootstrap, r=brson
afa1240 
Update stage0 bootstrap compiler

We've got a freshly minted beta compiler, let's update to use that on nightly!
This has a few other changes associated with it as well

* A bump to the rustc version number (to 1.19.0)
* Movement of the `cargo` and `rls` submodules to their "proper" location in
  `src/tools/{cargo,rls}`. Now that Cargo workspaces support the `exclude`
  option this can work.
* Updates of the `cargo` and `rls` submodules to their master branches.
* Tweak to the `src/stage0.txt` format to be more amenable for Cargo version
  numbers. On the beta channel Cargo will bootstrap from a different version
  than rustc (e.g. the version numbers are different), so we need different
  configuration for this.
* Addition of `dev` as a readable key in the `src/stage0.txt` format. If present
  then stage0 compilers are downloaded from `dev-static.rust-lang.org` instead
  of `static.rust-lang.org`. This is added to accomodate our updated release
  process with Travis and AppVeyor.
@bors
Copy link
Collaborator

bors commented Apr 29, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: brson
Pushing afa1240 to master...

@bors bors merged commit 5daf557 into rust-lang:master Apr 29, 2017
@alexcrichton alexcrichton deleted the bump-bootstrap branch May 4, 2017 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.